Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 6 Feb 2011 19:28:41 +0000 (11:28 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 6 Feb 2011 19:28:41 +0000 (11:28 -0800)
commit51d4f98f325d55ea4abd168bc7f3cd4dd892ff8c
tree88b171db45f8d8f38d490ac6184485ce81db9286
parent2f12f9310a00824c4b18880198e04e751f7d2e9c
parent1715c2ec74bcdbdca954a02137a2d8be87884362
Merge from mainline.